screenshot-ui: Add new selector icons

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1954>

diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
index 8cb4990b78f9285273c2e430e9b8c63254d2a92d..45cb9fc77f45bc5a772a33de29083c5491a8f0ed 100644 (file)
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -41,5 +41,8 @@
     <file>toggle-on-hc.svg</file>
     <file>toggle-on-light.svg</file>
     <file>workspace-placeholder.svg</file>
+    <file alias="icons/scalable/status/screenshot-ui-area-symbolic.svg">screenshot-ui-area-symbolic.svg</file>
+    <file alias="icons/scalable/status/screenshot-ui-display-symbolic.svg">screenshot-ui-display-symbolic.svg</file>
+    <file alias="icons/scalable/status/screenshot-ui-window-symbolic.svg">screenshot-ui-window-symbolic.svg</file>
   </gresource>
 </gresources>

diff --git a/data/theme/screenshot-ui-area-symbolic.svg b/data/theme/screenshot-ui-area-symbolic.svg
new file mode 100644 (file)
index 0000000..627288d
--- /dev/null
+++ b/data/theme/screenshot-ui-area-symbolic.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg"><path style="color:#000;fill:#241f31;stroke-linecap:square;-inkscape-stroke:none" d="M3.5 2A3.515 3.515 0 0 0 0 5.5c0 1.385.822 2.593 2 3.158V12h2V8.963A3.521 3.521 0 0 0 6.963 6H9V4H6.658A3.516 3.516 0 0 0 3.5 2zm25 0a3.516 3.516 0 0 0-3.158 2H23v2h2.037A3.521 3.521 0 0 0 28 8.963V12h2V8.658A3.516 3.516 0 0 0 32 5.5C32 3.579 30.421 2 28.5 2zm-25 2C4.34 4 5 4.66 5 5.5S4.34 7 3.5 7 2 6.34 2 5.5 2.66 4 3.5 4zM11 4v2h4V4h-4zm6 0v2h4V4h-4zm11.5 0c.84 0 1.5.66 1.5 1.5S29.34 7 28.5 7 27 6.34 27 5.5 27.66 4 28.5 4zM2 14v4h2v-4H2zm26 0v4h2v-4h-2zM2 20v3.342A3.516 3.516 0 0 0 0 26.5C0 28.421 1.579 30 3.5 30a3.516 3.516 0 0 0 3.158-2H9v-2H6.963A3.521 3.521 0 0 0 4 23.037V20H2zm26 0v3.037A3.521 3.521 0 0 0 25.037 26H23v2h2.342a3.516 3.516 0 0 0 3.158 2c1.921 0 3.5-1.579 3.5-3.5a3.516 3.516 0 0 0-2-3.158V20h-2zM3.5 25c.84 0 1.5.66 1.5 1.5S4.34 28 3.5 28 2 27.34 2 26.5 2.66 25 3.5 25zm25 0c.84 0 1.5.66 1.5 1.5s-.66 1.5-1.5 1.5-1.5-.66-1.5-1.5.66-1.5 1.5-1.5zM11 26v2h4v-2h-4zm6 0v2h4v-2h-4z"/></svg>
\ No newline at end of file

diff --git a/data/theme/screenshot-ui-display-symbolic.svg b/data/theme/screenshot-ui-display-symbolic.svg
new file mode 100644 (file)
index 0000000..5c740ab
--- /dev/null
+++ b/data/theme/screenshot-ui-display-symbolic.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="32.000008"
+   height="32.000008"
+   version="1.1"
+   id="svg8"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12" />
+  <path
+     id="path9443"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#241f31;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+     d="m 14.0007,23.00208 v 3.99609 h -3.002 c -1.0901,-7e-5 -1.998,0.90995 -1.998,2 h 1.998 10.002 2 c 0,-1.09005 -0.91,-1.99797 -2,-1.99804 h -2.9981 v -3.99805 z" />
+  <path
+     id="rect4301"
+     style="fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0;stroke-opacity:1"
+     d="m 3.9999981,4.0000107 c -1.662,0 -2.99999999,1.338 -2.99999999,3 V 21.000011 c 0,1.662 1.33799999,3 2.99999999,3 H 27.999998 c 1.662,0 3,-1.338 3,-3 V 7.0000107 c 0,-1.662 -1.338,-3 -3,-3 z m 0,2 H 27.999998 c 0.554,0 1,0.446 1,1 V 21.000011 c 0,0.554 -0.446,1 -1,1 H 3.9999981 c -0.554,0 -1,-0.446 -1,-1 V 7.0000107 c 0,-0.554 0.446,-1 1,-1 z" />
+  <rect
+     style="opacity:0.7;fill:#000000;fill-opacity:0;stroke:none;stroke-width:1.5;stroke-linejoin:round;stroke-dasharray:24, 6;stroke-opacity:1"
+     id="rect9439"
+     width="32.000008"
+     height="32.000008"
+     x="39.999989"
+     y="-1.1284424e-06" />
+</svg>

diff --git a/data/theme/screenshot-ui-window-symbolic.svg b/data/theme/screenshot-ui-window-symbolic.svg
new file mode 100644 (file)
index 0000000..c9124a4
--- /dev/null
+++ b/data/theme/screenshot-ui-window-symbolic.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="32.000008"
+   height="32.000008"
+   version="1.1"
+   id="svg8"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12" />
+  <g
+     id="g839">
+    <path
+       id="rect28516"
+       style="color:#000000;fill:#241f31;stroke-linecap:round;stroke-linejoin:round"
+       d="M 3,3 C 1.3552989,3 0,4.3552989 0,6 v 14 c 0,1.644701 1.3552989,3 3,3 H 8 V 21 H 3 C 2.4287033,21 2,20.571297 2,20 V 6 C 2,5.4287033 2.4287033,5 3,5 h 18.996094 c 0.571296,0 1,0.4287033 1,1 v 4 h 2 V 6 c 0,-1.6447011 -1.355299,-3 -3,-3 z" />
+    <path
+       style="color:#000000;fill:#241f31;stroke-linecap:round;stroke-linejoin:round"
+       d="m 9.9980469,9 c -1.6447011,0 -3,1.355299 -3,3 v 14 c 0,1.644701 1.3552989,3 3,3 H 28.996094 c 1.644701,0 3,-1.355299 3,-3 V 12 c 0,-1.644701 -1.355299,-3 -3,-3 z m 0,2 H 28.996094 c 0.571296,0 1,0.428703 1,1 v 14 c 0,0.571297 -0.428704,1 -1,1 H 9.9980469 c -0.5712967,0 -1,-0.428703 -1,-1 V 12 c 0,-0.571297 0.4287033,-1 1,-1 z"
+       id="rect28434" />
+  </g>
+</svg>

diff --git a/js/ui/screenshot.js b/js/ui/screenshot.js
index a00bcc3b3214b21a4ced380a60e61272ebf591cc..dbb993e74aff8134b5b467a58da46c7fb60c3b9e 100644 (file)
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@@ -962,7 +962,7 @@ class ScreenshotUI extends St.Widget {
         });
         this._panel.add_child(this._typeButtonContainer);
 
-        this._selectionButton = new IconLabelButton('input-mouse-symbolic', _('Selection'), {
+        this._selectionButton = new IconLabelButton('screenshot-ui-area-symbolic', _('Selection'), {
             style_class: 'screenshot-ui-type-button',
             checked: true,
             x_expand: true,
@@ -971,7 +971,7 @@ class ScreenshotUI extends St.Widget {
             this._onSelectionButtonToggled.bind(this));
         this._typeButtonContainer.add_child(this._selectionButton);
 
-        this._screenButton = new IconLabelButton('video-display-symbolic', _('Screen'), {
+        this._screenButton = new IconLabelButton('screenshot-ui-display-symbolic', _('Screen'), {
             style_class: 'screenshot-ui-type-button',
             toggle_mode: true,
             x_expand: true,
@@ -980,7 +980,7 @@ class ScreenshotUI extends St.Widget {
             this._onScreenButtonToggled.bind(this));
         this._typeButtonContainer.add_child(this._screenButton);
 
-        this._windowButton = new IconLabelButton('focus-windows-symbolic', _('Window'), {
+        this._windowButton = new IconLabelButton('screenshot-ui-window-symbolic', _('Window'), {
             style_class: 'screenshot-ui-type-button',
             toggle_mode: true,
             x_expand: true,